If not building libpng, don't rebuild gtkstockpixbufs.h (#81819, Bill

Wed May 15 11:13:19 2002  Owen Taylor  <otaylor@redhat.com>

        * configure.in gtk/stock-icons/Makefile.am: If not
        building libpng, don't rebuild gtkstockpixbufs.h
        (#81819, Bill Janssen)

diff --git a/ChangeLog b/ChangeLog
index ae4cf58ceb303a8356d8146a76ff8e767a5cccef..2ade4c3d50067fe1f09501538ea17328374e19d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed May 15 11:13:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in gtk/stock-icons/Makefile.am: If not
+       building libpng, don't rebuild gtkstockpixbufs.h
+       (#81819, Bill Janssen)
+
 2002-05-15  jacob berkman  <jacob@ximian.com>
 
        * demos/gtk-demo/Makefile.am (demos.h): just run perl on the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ae4cf58ceb303a8356d8146a76ff8e767a5cccef..2ade4c3d50067fe1f09501538ea17328374e19d2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Wed May 15 11:13:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in gtk/stock-icons/Makefile.am: If not
+       building libpng, don't rebuild gtkstockpixbufs.h
+       (#81819, Bill Janssen)
+
 2002-05-15  jacob berkman  <jacob@ximian.com>
 
        * demos/gtk-demo/Makefile.am (demos.h): just run perl on the

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ae4cf58ceb303a8356d8146a76ff8e767a5cccef..2ade4c3d50067fe1f09501538ea17328374e19d2 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Wed May 15 11:13:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in gtk/stock-icons/Makefile.am: If not
+       building libpng, don't rebuild gtkstockpixbufs.h
+       (#81819, Bill Janssen)
+
 2002-05-15  jacob berkman  <jacob@ximian.com>
 
        * demos/gtk-demo/Makefile.am (demos.h): just run perl on the

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ae4cf58ceb303a8356d8146a76ff8e767a5cccef..2ade4c3d50067fe1f09501538ea17328374e19d2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Wed May 15 11:13:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in gtk/stock-icons/Makefile.am: If not
+       building libpng, don't rebuild gtkstockpixbufs.h
+       (#81819, Bill Janssen)
+
 2002-05-15  jacob berkman  <jacob@ximian.com>
 
        * demos/gtk-demo/Makefile.am (demos.h): just run perl on the

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ae4cf58ceb303a8356d8146a76ff8e767a5cccef..2ade4c3d50067fe1f09501538ea17328374e19d2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Wed May 15 11:13:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in gtk/stock-icons/Makefile.am: If not
+       building libpng, don't rebuild gtkstockpixbufs.h
+       (#81819, Bill Janssen)
+
 2002-05-15  jacob berkman  <jacob@ximian.com>
 
        * demos/gtk-demo/Makefile.am (demos.h): just run perl on the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ae4cf58ceb303a8356d8146a76ff8e767a5cccef..2ade4c3d50067fe1f09501538ea17328374e19d2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Wed May 15 11:13:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in gtk/stock-icons/Makefile.am: If not
+       building libpng, don't rebuild gtkstockpixbufs.h
+       (#81819, Bill Janssen)
+
 2002-05-15  jacob berkman  <jacob@ximian.com>
 
        * demos/gtk-demo/Makefile.am (demos.h): just run perl on the

diff --git a/configure.in b/configure.in
index 74bc0313ff878114db9d7bc44d8bfa65ab3d4e0d..2320b13b56c95ae10accde5f5e50adbd204e14e5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -760,6 +760,12 @@ dnl Test for libmng
      fi
   fi
 
+  REBUILD_PNGS=\#
+  if test -z "$LIBPNG"; then
+     REBUILD_PNGS=
+  fi
+  AC_SUBST(REBUILD_PNGS)
+
 AC_SUBST(LIBTIFF)
 AC_SUBST(LIBJPEG)
 AC_SUBST(LIBPNG)

diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am
index 73ba213f4920578c88a21f7e806d99b585e96c56..f2807981c7e537242a216cddc18943d40c8802b9 100644 (file)
--- a/gtk/stock-icons/Makefile.am
+++ b/gtk/stock-icons/Makefile.am
@@ -263,7 +263,7 @@ else
 pixbuf_csource=GDK_PIXBUF_MODULEDIR=$(top_builddir)/gdk-pixbuf $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
 endif
 
-gtkstockpixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(IMAGES)
+gtkstockpixbufs.h: @REBUILD_PNGS@ $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(IMAGES)
        $(pixbuf_csource)                                                       \
           --raw --build-list $(VARIABLES1) > $(srcdir)/gtkstockpixbufs.h ||    \
            ( rm -f $(srcdir)/gtkstockpixbufs.h && false )